bitkeeper revision 1.897 (40a0eb02jGwqt6POLmCY0eC1hpHfvw)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 11 May 2004 15:02:26 +0000 (15:02 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Tue, 11 May 2004 15:02:26 +0000 (15:02 +0000)
commitb9b46efd4f4454835d467a7e82296d3e91097120
tree2426febf4feb562a7db1fc90711bf3f524423b05
parent07588dc73f0be59b52b968f7b88e43798bbe5e51
parent656a3b7d5ae1498df6893c5cc061765648b6970d
bitkeeper revision 1.897 (40a0eb02jGwqt6POLmCY0eC1hpHfvw)

trivial merge
tools/xc/py/Xc.c
xen/common/domain.c
xen/common/memory.c
xen/include/asm-i386/processor.h
xenolinux-2.4.26-sparse/arch/xen/drivers/console/console.c
xenolinux-2.4.26-sparse/arch/xen/mm/hypervisor.c
xenolinux-2.4.26-sparse/arch/xen/mm/ioremap.c
xenolinux-2.4.26-sparse/include/asm-xen/hypervisor.h